Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Thu, 22 Apr 2010 12:19:18 +0000 (12:19 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Thu, 22 Apr 2010 12:19:18 +0000 (12:19 +0000)
commit6aa9efabf9ff81af966356c6c77f40152df585b3
tree538312049a43151af03b09037f4176fb7cf9d943
parent022674342b99034557015f44ef5b20c36a2781f0
parent18da95d27233d4eb64ea38f8509b687fc0459aff
Merge from mainline.